diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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/~$\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"
index 7920004..d97d127 100644
--- "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"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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/~$\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"
index 7920004..d97d127 100644
--- "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"
Binary files differ
diff --git "a/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..cdff59f
--- /dev/null
+++ "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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/~$\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"
index 7920004..d97d127 100644
--- "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"
Binary files differ
diff --git "a/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..cdff59f
--- /dev/null
+++ "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
deleted file mode 100644
index 44e5569..0000000
--- "a/~$\350\257\264\346\230\21620181227.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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/~$\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"
index 7920004..d97d127 100644
--- "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"
Binary files differ
diff --git "a/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..cdff59f
--- /dev/null
+++ "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
deleted file mode 100644
index 44e5569..0000000
--- "a/~$\350\257\264\346\230\21620181227.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
deleted file mode 100644
index c68c40b..0000000
--- "a/~$\350\257\264\346\230\21620190527.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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/~$\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"
index 7920004..d97d127 100644
--- "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"
Binary files differ
diff --git "a/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..cdff59f
--- /dev/null
+++ "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
deleted file mode 100644
index 44e5569..0000000
--- "a/~$\350\257\264\346\230\21620181227.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
deleted file mode 100644
index c68c40b..0000000
--- "a/~$\350\257\264\346\230\21620190527.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190612.docx" "b/~$\350\257\264\346\230\21620190612.docx"
deleted file mode 100644
index 5cfb046..0000000
--- "a/~$\350\257\264\346\230\21620190612.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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/~$\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"
index 7920004..d97d127 100644
--- "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"
Binary files differ
diff --git "a/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..cdff59f
--- /dev/null
+++ "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
deleted file mode 100644
index 44e5569..0000000
--- "a/~$\350\257\264\346\230\21620181227.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
deleted file mode 100644
index c68c40b..0000000
--- "a/~$\350\257\264\346\230\21620190527.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190612.docx" "b/~$\350\257\264\346\230\21620190612.docx"
deleted file mode 100644
index 5cfb046..0000000
--- "a/~$\350\257\264\346\230\21620190612.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190726.docx" "b/~$\350\257\264\346\230\21620190726.docx"
deleted file mode 100644
index 78a896a..0000000
--- "a/~$\350\257\264\346\230\21620190726.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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/~$\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"
index 7920004..d97d127 100644
--- "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"
Binary files differ
diff --git "a/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..cdff59f
--- /dev/null
+++ "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
deleted file mode 100644
index 44e5569..0000000
--- "a/~$\350\257\264\346\230\21620181227.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
deleted file mode 100644
index c68c40b..0000000
--- "a/~$\350\257\264\346\230\21620190527.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190612.docx" "b/~$\350\257\264\346\230\21620190612.docx"
deleted file mode 100644
index 5cfb046..0000000
--- "a/~$\350\257\264\346\230\21620190612.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190726.docx" "b/~$\350\257\264\346\230\21620190726.docx"
deleted file mode 100644
index 78a896a..0000000
--- "a/~$\350\257\264\346\230\21620190726.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
deleted file mode 100644
index 575ddd4..0000000
--- "a/~$\350\257\264\346\230\21620190828.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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/~$\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"
index 7920004..d97d127 100644
--- "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"
Binary files differ
diff --git "a/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..cdff59f
--- /dev/null
+++ "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
deleted file mode 100644
index 44e5569..0000000
--- "a/~$\350\257\264\346\230\21620181227.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
deleted file mode 100644
index c68c40b..0000000
--- "a/~$\350\257\264\346\230\21620190527.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190612.docx" "b/~$\350\257\264\346\230\21620190612.docx"
deleted file mode 100644
index 5cfb046..0000000
--- "a/~$\350\257\264\346\230\21620190612.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190726.docx" "b/~$\350\257\264\346\230\21620190726.docx"
deleted file mode 100644
index 78a896a..0000000
--- "a/~$\350\257\264\346\230\21620190726.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
deleted file mode 100644
index 575ddd4..0000000
--- "a/~$\350\257\264\346\230\21620190828.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190910.docx" "b/~$\350\257\264\346\230\21620190910.docx"
index 7ab3eeb..01e93f2 100644
--- "a/~$\350\257\264\346\230\21620190910.docx"
+++ "b/~$\350\257\264\346\230\21620190910.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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/~$\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"
index 7920004..d97d127 100644
--- "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"
Binary files differ
diff --git "a/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..cdff59f
--- /dev/null
+++ "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
deleted file mode 100644
index 44e5569..0000000
--- "a/~$\350\257\264\346\230\21620181227.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
deleted file mode 100644
index c68c40b..0000000
--- "a/~$\350\257\264\346\230\21620190527.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190612.docx" "b/~$\350\257\264\346\230\21620190612.docx"
deleted file mode 100644
index 5cfb046..0000000
--- "a/~$\350\257\264\346\230\21620190612.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190726.docx" "b/~$\350\257\264\346\230\21620190726.docx"
deleted file mode 100644
index 78a896a..0000000
--- "a/~$\350\257\264\346\230\21620190726.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
deleted file mode 100644
index 575ddd4..0000000
--- "a/~$\350\257\264\346\230\21620190828.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190910.docx" "b/~$\350\257\264\346\230\21620190910.docx"
index 7ab3eeb..01e93f2 100644
--- "a/~$\350\257\264\346\230\21620190910.docx"
+++ "b/~$\350\257\264\346\230\21620190910.docx"
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"
index 4407b37..8eb33fb 100644
--- "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"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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/~$\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"
index 7920004..d97d127 100644
--- "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"
Binary files differ
diff --git "a/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..cdff59f
--- /dev/null
+++ "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
deleted file mode 100644
index 44e5569..0000000
--- "a/~$\350\257\264\346\230\21620181227.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
deleted file mode 100644
index c68c40b..0000000
--- "a/~$\350\257\264\346\230\21620190527.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190612.docx" "b/~$\350\257\264\346\230\21620190612.docx"
deleted file mode 100644
index 5cfb046..0000000
--- "a/~$\350\257\264\346\230\21620190612.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190726.docx" "b/~$\350\257\264\346\230\21620190726.docx"
deleted file mode 100644
index 78a896a..0000000
--- "a/~$\350\257\264\346\230\21620190726.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
deleted file mode 100644
index 575ddd4..0000000
--- "a/~$\350\257\264\346\230\21620190828.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190910.docx" "b/~$\350\257\264\346\230\21620190910.docx"
index 7ab3eeb..01e93f2 100644
--- "a/~$\350\257\264\346\230\21620190910.docx"
+++ "b/~$\350\257\264\346\230\21620190910.docx"
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"
index 4407b37..8eb33fb 100644
--- "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"
Binary files differ
diff --git "a/\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..bd2407d
--- /dev/null
+++ "b/\346\231\272\350\203\275\350\247\204\345\210\222.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c23384..6c05feb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" beforeDir="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/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/manager/PgDeviceTypeManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.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/patroler/manager/PgLogManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.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$/~$控制接口说明.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20181227.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190527.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190612.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190726.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190828.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190910.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190910.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190828.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,24 +78,24 @@
         <counts>
           <entry key="class" value="2" />
           <entry key="iml" value="2" />
-          <entry key="java" value="347" />
+          <entry key="java" value="493" />
           <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
+          <entry key="xml" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
+          <entry key="JAVA" value="493" />
           <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
+          <entry key="XML" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
+          <entry key="dummy" value="37" />
+          <entry key="java" value="23646" />
           <entry key="properties" value="59" />
           <entry key="txt" value="122" />
           <entry key="xml" value="2" />
@@ -69,16 +103,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
+          <entry key="JAVA" value="23646" />
+          <entry key="PLAIN_TEXT" value="159" />
           <entry key="Properties" value="59" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="35" />
+          <entry key="project.closed" value="37" />
           <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
@@ -86,11 +122,12 @@
           <entry key="project.open.time.23" 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.27" value="2" />
           <entry key="project.open.time.28" value="1" />
           <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.30" value="2" />
           <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
+          <entry key="project.open.time.35" value="2" />
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
@@ -111,8 +148,9 @@
           <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.open.time.8" value="2" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
+          <entry key="project.opened" value="63" />
         </counts>
       </usages-collector>
     </session>
@@ -120,46 +158,89 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="374">
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+            <state relative-caret-position="114">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+                <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+                <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+                <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+        <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="198">
-              <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+            <state relative-caret-position="364">
+              <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+                <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+                <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+                <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+                <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="22">
+              <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+              <folding>
+                <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+                <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -184,6 +265,12 @@
       <find>message</find>
       <find>getConstructionByType</find>
       <find>getPgCameraListByPosition</find>
+      <find>incriter</find>
+      <find>I</find>
+      <find>inCriteria</find>
+      <find>getPgPlanResulList</find>
+      <find>getPipeLineBylineName</find>
+      <find>getPileAcuListByPileAcuStr</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -192,40 +279,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.java" />
@@ -243,6 +296,40 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLine.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.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/intelPlan/manager/PgPileAcuManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.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/PgPipeLineRs.java" />
       </list>
     </option>
   </component>
@@ -278,16 +365,17 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1378" />
+    <option name="height" value="780" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -329,7 +417,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -338,14 +426,41 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
+              <item name="intelPlan" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="intelPlan" type="462c0819:PsiDirectoryNode" />
               <item name="manager" 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="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -513,6 +628,14 @@
       <workItem from="1569482281499" duration="2528000" />
       <workItem from="1570496270636" duration="117000" />
       <workItem from="1570850955694" duration="3057000" />
+      <workItem from="1572932652110" duration="2913000" />
+      <workItem from="1572936626443" duration="4149000" />
+      <workItem from="1573001301436" duration="877000" />
+      <workItem from="1573007346348" duration="5102000" />
+      <workItem from="1573087993021" duration="24871000" />
+      <workItem from="1573436944714" duration="26212000" />
+      <workItem from="1573520380986" duration="28992000" />
+      <workItem from="1573606587429" duration="1390000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -602,7 +725,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215291000" />
+    <option name="totallyTimeSpent" value="309797000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -617,7 +740,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19515885" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
       <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" />
@@ -654,7 +777,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20726173" />
       <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" />
@@ -662,33 +785,33 @@
       <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" 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="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.4967213" />
+      <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" 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" />
+      <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.3262295" />
+      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
+      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -737,101 +860,45 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+    <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="22">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <state relative-caret-position="484">
+          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.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 relative-caret-position="1012">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.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 relative-caret-position="880">
+          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.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 relative-caret-position="88">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+    <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="418">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="260">
+          <caret line="69" column="9" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
         </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/maintenance/manager/PgMaintanceRecordHeadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.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/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" />
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
         </state>
       </provider>
     </entry>
@@ -842,230 +909,336 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <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 relative-caret-position="792">
+          <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
         </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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+    <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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+    <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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
+        <state relative-caret-position="392">
+          <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/rs/PgDeviceRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
+        <state relative-caret-position="374">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
+    <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="406">
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
           <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+    <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="-730">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </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="192">
+          <caret line="60" column="7" lean-forward="true" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="45" column="5" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        </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="-198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </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="352">
+          <caret line="71" column="21" lean-forward="true" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
+        </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="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+          <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <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="85">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
+        <state relative-caret-position="-1100">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/criterion/Restrictions.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="48" column="112" selection-start-line="48" selection-start-column="112" selection-end-line="48" selection-end-column="112" />
+        <state relative-caret-position="194">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="50" column="109" selection-start-line="50" selection-start-column="109" selection-end-line="50" selection-end-column="109" />
+          <caret line="9" column="32" lean-forward="true" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </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="406">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="67" column="9" lean-forward="true" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <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/intelPlan/dto/PgSectionDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="19" column="48" lean-forward="true" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPipeLine.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPipeLineDTO.java" />
+    <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="194">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="528">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgPileAcuByCode#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPileAcuListByPileAcuStr#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultList#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPgPlanResultByPlantask#0;class#PgPileAcuManager#0" />
+            <element signature="method#getPlanResult#0;class#PgPileAcuManager#0" />
+            <element signature="method#canPlanLine#0;class#PgPileAcuManager#0" />
+            <element signature="method#getAcuListLength#0;class#PgPileAcuManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getPgLineHole#0;class#PgLineHoleManager#0" />
+            <element signature="method#isExistLine#0;class#PgLineHoleManager#0" />
+            <element signature="method#getCurrentHoleByAcu#0;class#PgLineHoleManager#0" />
+          </folding>
+        </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="22">
+          <caret line="56" column="45" lean-forward="true" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeTypeNum#0;class#PgPipeLineManager#0" />
+          </folding>
+        </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="364">
+          <caret line="65" column="5" lean-forward="true" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="docComment;method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/.idea/workspace.xml___jb_tmp___ b/.idea/workspace.xml___jb_tmp___
deleted file mode 100644
index 8b77bb2..0000000
--- a/.idea/workspace.xml___jb_tmp___
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="PgInterface" />
-    </artifacts-to-build>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml___jb_tmp___" 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/devData/manager/PgCh4Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/../out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1382581099">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="347" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="347" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="6" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dummy" value="16" />
-          <entry key="java" value="11629" />
-          <entry key="properties" value="59" />
-          <entry key="txt" value="122" />
-          <entry key="xml" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="11629" />
-          <entry key="PLAIN_TEXT" value="138" />
-          <entry key="Properties" value="59" />
-          <entry key="XML" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.1" value="5" />
-          <entry key="project.open.time.16" value="1" />
-          <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.23" 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.28" value="1" />
-          <entry key="project.open.time.3" value="6" />
-          <entry key="project.open.time.31" value="2" />
-          <entry key="project.open.time.35" value="1" />
-          <entry key="project.open.time.36" value="1" />
-          <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="2" />
-          <entry key="project.open.time.43" value="1" />
-          <entry key="project.open.time.44" value="3" />
-          <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="3" />
-          <entry key="project.open.time.51" value="2" />
-          <entry key="project.open.time.58" value="2" />
-          <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.63" 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.open.time.97" value="1" />
-          <entry key="project.opened" value="55" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getMonthAlarmNum</find>
-      <find>getAlarmList</find>
-      <find>compositeFilter</find>
-      <find>alarmTypeId</find>
-      <find>getPipeGalleryByPgName</find>
-      <find>getPgDeviceByDevType</find>
-      <find>message</find>
-      <find>getConstructionByType</find>
-      <find>getPgCameraListByPosition</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
-        <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/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/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/manager/PgAssetManager.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/resources/spring/applicationContext-springmvc.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.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/PgAssetPlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Program Files/java/apache-maven-3.2.3" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="57" />
-    <option name="y" value="93" />
-    <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="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38850576" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="BROWSER_ID" value="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="PgInterface">
-          <settings>
-            <option name="CONTEXT_PATH" value="/PgInterface" />
-          </settings>
-        </artifact>
-      </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" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="35177" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method v="2">
-        <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="" />
-      <created>1559274313127</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1559274313127</updated>
-      <workItem from="1559274321143" duration="5432000" />
-      <workItem from="1559534294471" duration="2843000" />
-      <workItem from="1559627032883" duration="1933000" />
-      <workItem from="1559642367296" duration="19852000" />
-      <workItem from="1559608841950" duration="1183000" />
-      <workItem from="1559626533353" duration="806000" />
-      <workItem from="1559811129392" duration="664000" />
-      <workItem from="1560215819197" duration="12531000" />
-      <workItem from="1560300112847" duration="20955000" />
-      <workItem from="1560386749989" duration="2466000" />
-      <workItem from="1563781880751" duration="5265000" />
-      <workItem from="1563843453180" duration="634000" />
-      <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="4416000" />
-      <workItem from="1564448538977" duration="3857000" />
-      <workItem from="1564455098062" duration="2354000" />
-      <workItem from="1566095731601" duration="5201000" />
-      <workItem from="1566176164703" duration="807000" />
-      <workItem from="1566182732032" duration="410000" />
-      <workItem from="1566205202678" duration="10390000" />
-      <workItem from="1566290405137" duration="2006000" />
-      <workItem from="1566349227516" duration="1413000" />
-      <workItem from="1566350810712" duration="6803000" />
-      <workItem from="1566435787074" duration="10717000" />
-      <workItem from="1566521753529" duration="14265000" />
-      <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="5005000" />
-      <workItem from="1568097313441" duration="669000" />
-      <workItem from="1568098092196" duration="4371000" />
-      <workItem from="1568162940476" duration="782000" />
-      <workItem from="1568179684726" duration="584000" />
-      <workItem from="1568188168197" duration="699000" />
-      <workItem from="1568595245556" duration="2333000" />
-      <workItem from="1568768299452" duration="3615000" />
-      <workItem from="1568968935890" duration="2281000" />
-      <workItem from="1568972336965" duration="723000" />
-      <workItem from="1569200362563" duration="2426000" />
-      <workItem from="1569467694342" duration="234000" />
-      <workItem from="1569482281499" duration="2528000" />
-      <workItem from="1570496270636" duration="117000" />
-      <workItem from="1570850955694" duration="3646000" />
-    </task>
-    <task id="LOCAL-00001" summary="修改无数据提示信息">
-      <created>1564361618083</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1564361618083</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修改设备编号对不上问题">
-      <created>1566216937991</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1566216937991</updated>
-    </task>
-    <task id="LOCAL-00003" summary="修改权限问题">
-      <created>1566349743252</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1566349743252</updated>
-    </task>
-    <task id="LOCAL-00004" summary="修改人员登录返回接口">
-      <created>1566382083034</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1566382083035</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改报警统计">
-      <created>1566553388171</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1566553388171</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00011" summary="修改巡检内容">
-      <created>1568086635507</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1568086635507</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改巡检内容">
-      <created>1568768749481</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1568768749481</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="215880000" />
-  </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" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27760968" />
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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.4967213" />
-      <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" 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" />
-      <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.3262295" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.5229508" />
-      <window_info anchor="bottom" id="Thumbnails" order="16" weight="0.3295082" />
-      <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.24962178" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
-    </layout>
-    <layout-to-restore>
-      <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" />
-      <window_info id="UI Designer" order="4" />
-      <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" 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" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" />
-    </layout-to-restore>
-  </component>
-  <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>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改无数据提示信息" />
-    <MESSAGE value="修改设备编号对不上问题" />
-    <MESSAGE value="修改权限问题" />
-    <MESSAGE value="修改人员登录返回接口" />
-    <MESSAGE value="修改报警统计" />
-    <MESSAGE value="整理管线部分" />
-    <MESSAGE value="合并代码提交" />
-    <MESSAGE value="修改报警阈值" />
-    <MESSAGE value="修改巡检维护表字段" />
-    <MESSAGE value="修改巡检内容" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改巡检内容" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java</url>
-          <line>40</line>
-          <properties />
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/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/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/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" />
-    <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" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
-    <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/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="55" 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/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-38">
-          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PgInterface.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="98" column="30" selection-end-line="118" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="34" column="57" selection-start-line="34" selection-start-column="57" selection-end-line="34" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </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="-14">
-          <caret line="166" column="6" lean-forward="true" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="418" column="19" selection-start-line="418" selection-start-column="19" selection-end-line="418" selection-end-column="19" />
-        </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="392">
-          <caret line="72" column="39" lean-forward="true" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
-        </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="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="27" selection-end-column="92" />
-        </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="352">
-          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
-        </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="396">
-          <caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
-        </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="286">
-          <caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-        </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="440">
-          <caret line="21" column="26" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="26" />
-        </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="352">
-          <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
-          <folding>
-            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
-            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
-            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
-          </folding>
-        </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="484">
-          <caret line="40" column="94" selection-start-line="40" selection-start-column="94" selection-end-line="40" selection-end-column="94" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="56" column="46" lean-forward="true" selection-start-line="56" selection-start-column="46" selection-end-line="56" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="66" column="24" lean-forward="true" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
-        </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="274">
-          <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web|PgInterface</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.38850576" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
index 9ff7cef..85d5a63 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java
@@ -16,15 +16,11 @@
 public class PgPipeLine implements Serializable {
     private static final long serialVersionUID = 1L;
     private long id;
-    private String lineName;//管线唯一名称
+    private String lineCode;//管线唯一名称
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private Date enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
-    private double pipeLength;//管线长度
-    private Long partitionId;//所在分区
-    private Long pipeGalleryId;//所在管廊信息
+    private double length;//管线长度
     private int active;//状态位
 
     @Id
@@ -37,13 +33,13 @@
         this.id = id;
     }
 
-    @Column(name = "LINE_NAME")
-    public String getLineName() {
-        return lineName;
+    @Column(name = "LINECODE")
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     @Column(name = "LINE_TYPE")
@@ -64,24 +60,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    @Column(name = "ENTERDATE")
-    public Date getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(Date enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    @Column(name = "LAYERNUM")
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     @Column(name = "DIAMETER")
     public String getDiameter() {
         return diameter;
@@ -91,13 +69,13 @@
         this.diameter = diameter;
     }
 
-    @Column(name = "PIPE_LENGTH")
-    public double getPipeLength() {
-        return pipeLength;
+    @Column(name = "LENGTH")
+    public double getLength() {
+        return length;
     }
 
-    public void setPipeLength(double pipeLength) {
-        this.pipeLength = pipeLength;
+    public void setLength(double length) {
+        this.length = length;
     }
 
     @Column(name = "ACTIVE")
@@ -109,21 +87,5 @@
         this.active = active;
     }
 
-    @Column(name = "pipeGalleryId")
-    public Long getPipeGalleryId() {
-        return pipeGalleryId;
-    }
 
-    public void setPipeGalleryId(Long pipeGalleryId) {
-        this.pipeGalleryId = pipeGalleryId;
-    }
-
-    @Column(name="PARTITIONID")
-    public Long getPartitionId() {
-        return partitionId;
-    }
-
-    public void setPartitionId(Long partitionId) {
-        this.partitionId = partitionId;
-    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
index 77508e5..edb5cd3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java
@@ -12,15 +12,11 @@
 public class PgPipeLineDto{
 
     private String id;
-    private String lineName;//管线唯一编号
+    private String lineCode;//管线唯一编号
     private String lineType;//管线类型
     private String ownerUnit;//权属单位
-    private String enterDate;//入廊时间
-    private String layerNum;//所在层数
     private String diameter;//管径
     private String pipeLength;//管线长度
-    private String pipeGallery;//仓位
-    private String partition;//分区
     private String active;//状态位
 
     public String getId() {
@@ -31,12 +27,12 @@
         this.id = id;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getLineCode() {
+        return lineCode;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 
     public String getLineType() {
@@ -55,22 +51,6 @@
         this.ownerUnit = ownerUnit;
     }
 
-    public String getEnterDate() {
-        return enterDate;
-    }
-
-    public void setEnterDate(String enterDate) {
-        this.enterDate = enterDate;
-    }
-
-    public String getLayerNum() {
-        return layerNum;
-    }
-
-    public void setLayerNum(String layerNum) {
-        this.layerNum = layerNum;
-    }
-
     public String getDiameter() {
         return diameter;
     }
@@ -79,14 +59,6 @@
         this.diameter = diameter;
     }
 
-    public String getPipeGallery() {
-        return pipeGallery;
-    }
-
-    public void setPipeGallery(String pipeGallery) {
-        this.pipeGallery = pipeGallery;
-    }
-
     public String getPipeLength() {
         return pipeLength;
     }
@@ -95,14 +67,6 @@
         this.pipeLength = pipeLength;
     }
 
-    public String getPartition() {
-        return partition;
-    }
-
-    public void setPartition(String partition) {
-        this.partition = partition;
-    }
-
     public String getActive() {
         return active;
     }
@@ -111,31 +75,16 @@
         this.active = active;
     }
 
-    public PgPipeLineDto(PgPipeLine pgPipeLine, PgPartitionManager pgPartitionManager, PipeGalleryManager pipeGalleryManager) {
+    public PgPipeLineDto(PgPipeLine pgPipeLine) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgPipeLine.getId()));
-        this.setLineName(pgPipeLine.getLineName());
+        this.setLineCode(pgPipeLine.getLineCode());
         this.setLineType(pgPipeLine.getLineType());
         this.setOwnerUnit(pgPipeLine.getOwnerUnit());
-        if (pgPipeLine.getEnterDate() != null)
-            this.setEnterDate(sdf.format(pgPipeLine.getEnterDate()));
-        else
-            this.setEnterDate("");
-        this.setLayerNum(pgPipeLine.getLayerNum());
         this.setDiameter(pgPipeLine.getDiameter());
-        this.setPipeLength(String.valueOf(pgPipeLine.getPipeLength()));
+        this.setPipeLength(String.valueOf(pgPipeLine.getLength()));
         this.setActive(String.valueOf(pgPipeLine.getActive()));
 
-        if(pgPipeLine.getPipeGalleryId()==null||pipeGalleryManager.get(pgPipeLine.getPipeGalleryId())==null)
-            this.setPipeGallery("");
-        else
-            this.setPipeGallery(pipeGalleryManager.get(pgPipeLine.getPipeGalleryId()).getPgName());
-
-        if(pgPipeLine.getPartitionId()==null||pgPartitionManager.get(pgPipeLine.getPartitionId())==null)
-            this.setPartition("");
-        else
-            this.setPartition(pgPartitionManager.get(pgPipeLine.getPartitionId()).getParName());
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
index 9ea43fd..c555e95 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.java
@@ -15,7 +15,7 @@
  * Created by yxw on 2018/1/8.
  */
 @Service
-public class PgDeviceTypeManager  extends HibernateEntityDao<PgDeviceType> {
+public class PgDeviceTypeManager extends HibernateEntityDao<PgDeviceType> {
 
     public List<PgDeviceTypeDto> getAllDeviceType() {
 
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 e413a5c..27f01b3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -7,13 +7,16 @@
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import javax.ws.rs.FormParam;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/10/30.
@@ -22,14 +25,14 @@
 public class PgPipeLineManager extends HibernateEntityDao<PgPipeLine> {
 
     @Resource
-    private PgPartitionManager pgPartitionManager;
+    private PgPileAcuManager pgPileAcuManager;
 
     @Resource
-    private PipeGalleryManager pipeGalleryManager;
+    private PgLineHoleManager pgLineHoleManager;
 
-    public PgPipeLine getPipeLineBylineName(String lineName) {
+    public PgPipeLine getPipeLineBylineName(String lineCode) {
         Criteria criteria=createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineName", lineName));
+        criteria.add(Restrictions.eq("lineCode", lineCode));
 
         List<PgPipeLine> pgPipeLineList =criteria.list();
         if(pgPipeLineList.size()==0)
@@ -46,13 +49,13 @@
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
         for (PgPipeLine pgPipeLine : pgPipeLineList) {
-            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager));
+            pgPipeLineDtoList.add(new PgPipeLineDto(pgPipeLine));
         }
         return pgPipeLineDtoList;
     }
 
     public List<PgPipeLineLengthStatic> getPipeLengthByName() {
-        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
+        String sql = "select LINE_TYPE,SUM(LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
         List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<>();
@@ -101,4 +104,40 @@
         return pgPipeLineTypeNumDtoList;
     }
 
+    public Map<String,Object> addPipeLine(String lineCode, String lineType, String ownerUnit, String diameter,
+                                          String secRow, String secColumn, String pileAcuList){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<String> pileAcuListStr = Arrays.asList(pileAcuList.split(","));
+        List<PgPileAcu> pgPileAcuList=pgPileAcuManager.getPileAcuListByPileAcuStr(pileAcuListStr);
+        Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList);
+        try{
+            PgPipeLine pgPipeLine=new PgPipeLine();
+            pgPipeLine.setLineCode(lineCode);
+            pgPipeLine.setLineType(lineType);
+            pgPipeLine.setOwnerUnit(ownerUnit);
+            pgPipeLine.setDiameter(diameter);
+            pgPipeLine.setLength(acuLength);
+            pgPipeLine.setActive(1);
+
+            //新增管线
+            pgPileAcuManager.save(pgPipeLine);
+
+            pgLineHoleManager.addPgLIneHole(pgPileAcuList,lineType,secRow,secColumn);
+            msg="管线保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="管线保存失败";
+            result="false";
+        }
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
new file mode 100644
index 0000000..a085001
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_LINEHOLE")
+@SequenceGenerator(name = "SEQ_PG_LINEHOLE_ID", sequenceName = "SEQ_PG_LINEHOLE_ID", allocationSize = 1, initialValue = 1)
+public class PgLineHole implements Serializable {
+
+    private Long id;
+    private String lineName;//入廊管线ID
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_LINEHOLE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="PILEACUID")
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
new file mode 100644
index 0000000..c655eda
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java
@@ -0,0 +1,42 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILE")
+@SequenceGenerator(name = "SEQ_PG_PILE_ID", sequenceName = "SEQ_PG_PILE_ID", allocationSize = 1, initialValue = 1)
+public class PgPile implements Serializable {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILE_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="PILECODE")
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
new file mode 100644
index 0000000..349c9a6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java
@@ -0,0 +1,63 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_PILEACU")
+@SequenceGenerator(name = "SEQ_PG_PILEACU_ID", sequenceName = "SEQ_PG_PILEACU_ID", allocationSize = 1, initialValue = 1)
+public class PgPileAcu implements Serializable {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private Long roadId;//所属道路
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PILEACU_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ACUCODE")
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    @Column(name="LENGTH")
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
new file mode 100644
index 0000000..34b4e22
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java
@@ -0,0 +1,72 @@
+package com.casic.PgInterface.intelPlan.domain;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_SECTION")
+@SequenceGenerator(name = "SEQ_PG_SECTION_ID", sequenceName = "SEQ_PG_SECTION_ID", allocationSize = 1, initialValue = 1)
+public class PgSection implements Serializable {
+
+    private Long id;
+    private Long roadId;//截面类型
+    private String lineName;//管线类型
+    private Long secRow;//行数
+    private Long secColumn;//列数
+    private boolean active;//状态位
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SECTION_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ROADID")
+    public Long getRoadId() {
+        return roadId;
+    }
+
+    public void setRoadId(Long roadId) {
+        this.roadId = roadId;
+    }
+
+    @Column(name="LINENAME")
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @Column(name="SECROW")
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    @Column(name="SECCOLUMN")
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    @Column(name="ACTIVE")
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
new file mode 100644
index 0000000..010b438
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgLineHoleDTO {
+
+    private Long id;
+    private String lineName;//管线
+    private Long pileAcuId;//桩分区ID
+    private Long secRow;//行号
+    private Long secColumn;//列号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getPileAcuId() {
+        return pileAcuId;
+    }
+
+    public void setPileAcuId(Long pileAcuId) {
+        this.pileAcuId = pileAcuId;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
new file mode 100644
index 0000000..b99f8b6
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java
@@ -0,0 +1,73 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileAcuDTO {
+
+    private Long id;
+    private String acuCode;//编号
+    private Long length;//长度
+    private String road;//界面类型
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAcuCode() {
+        return acuCode;
+    }
+
+    public void setAcuCode(String acuCode) {
+        this.acuCode = acuCode;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public static PgPileAcuDTO ConvertToDTO(PgPileAcu pgPileAcu, PgRoadManager pgRoadManager){
+        PgPileAcuDTO pgPileAcuDTO=new PgPileAcuDTO();
+
+        pgPileAcuDTO.setId(pgPileAcu.getId());
+        pgPileAcuDTO.setAcuCode(pgPileAcu.getAcuCode());
+        pgPileAcuDTO.setLength(pgPileAcu.getLength());
+
+        if(pgPileAcu.getRoadId()==null||pgRoadManager.get(pgPileAcu.getRoadId())==null)
+            pgPileAcuDTO.setRoad("");
+        else
+            pgPileAcuDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+
+        return pgPileAcuDTO;
+    }
+
+    public static List<PgPileAcuDTO> ConvertToDTOList(List<PgPileAcu> pgPileAcuList,PgRoadManager pgRoadManager){
+
+        List<PgPileAcuDTO> pgPileAcuDTOList=new ArrayList<>();
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            pgPileAcuDTOList.add(ConvertToDTO(pgPileAcu,pgRoadManager));
+        }
+
+        return pgPileAcuDTOList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
new file mode 100644
index 0000000..7e7c35c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java
@@ -0,0 +1,59 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgPileDTO {
+
+    private Long id;
+    private String pileCode;//编号
+    private boolean active;//状态位
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPileCode() {
+        return pileCode;
+    }
+
+    public void setPileCode(String pileCode) {
+        this.pileCode = pileCode;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public static PgPileDTO ConvertToDTO(PgPile pgPile){
+        if(pgPile==null) return null;
+        PgPileDTO pgLineDTO=new PgPileDTO();
+
+        pgLineDTO.setId(pgPile.getId());
+        pgLineDTO.setPileCode(pgPile.getPileCode());
+
+        return pgLineDTO;
+    }
+
+    public static List<PgPileDTO> ConvertToDTOList(List<PgPile> pgPileList){
+
+        if(pgPileList==null) return null;
+        List<PgPileDTO> pgLineDTOList=new ArrayList<>();
+
+        for(PgPile pgPile:pgPileList){
+            pgLineDTOList.add(ConvertToDTO(pgPile));
+        }
+        return pgLineDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
new file mode 100644
index 0000000..45a2ceb
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java
@@ -0,0 +1,17 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanParams {
+
+    private List<PgPlanTask> pgPlanTaskList;
+
+    public List<PgPlanTask> getPgPlanTaskList() {
+        return pgPlanTaskList;
+    }
+
+    public void setPgPlanTaskList(List<PgPlanTask> pgPlanTaskList) {
+        this.pgPlanTaskList = pgPlanTaskList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
new file mode 100644
index 0000000..73b6fe1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java
@@ -0,0 +1,41 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgPlanResult {
+
+    private String lineName;
+    private int secRow;
+    private int secColumn;
+    private Long length;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(int secRow) {
+        this.secRow = secRow;
+    }
+
+    public int getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(int secColumn) {
+        this.secColumn = secColumn;
+    }
+
+    public Long getLength() {
+        return length;
+    }
+
+    public void setLength(Long length) {
+        this.length = length;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
new file mode 100644
index 0000000..12abaa8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanResultRe {
+
+    private String taskKey;
+    private List<PgPlanResult> pgPlanResultList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public List<PgPlanResult> getPgPlanResultList() {
+        return pgPlanResultList;
+    }
+
+    public void setPgPlanResultList(List<PgPlanResult> pgPlanResultList) {
+        this.pgPlanResultList = pgPlanResultList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
new file mode 100644
index 0000000..da4d0b2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java
@@ -0,0 +1,35 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+import java.util.List;
+
+public class PgPlanTask {
+
+    private String taskKey;
+    private String lineName;
+    private List<String> pileAcuList;
+
+    public String getTaskKey() {
+        return taskKey;
+    }
+
+    public void setTaskKey(String taskKey) {
+        this.taskKey = taskKey;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
new file mode 100644
index 0000000..becc375
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java
@@ -0,0 +1,52 @@
+package com.casic.PgInterface.intelPlan.dto;
+
+public class PgSectionDTO {
+
+    private Long id;
+    private String road;//界面类型
+    private String lineName;
+    private Long secRow;//行数
+    private Long secColumn;//列数
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRoad() {
+        return road;
+    }
+
+    public void setRoad(String road) {
+        this.road = road;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Long getSecRow() {
+        return secRow;
+    }
+
+    public void setSecRow(Long secRow) {
+        this.secRow = secRow;
+    }
+
+    public Long getSecColumn() {
+        return secColumn;
+    }
+
+    public void setSecColumn(Long secColumn) {
+        this.secColumn = secColumn;
+    }
+
+
+}
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
new file mode 100644
index 0000000..1ed5723
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -0,0 +1,65 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgLineHoleManager extends HibernateEntityDao<PgLineHole> {
+
+    public List<PgLineHole> getPgLineHole(String lineName,Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public boolean isExistLine(List<PgLineHole> pgLineHoleList,int row,int column){
+        for(PgLineHole pgLineHole:pgLineHoleList){
+            if(pgLineHole.getSecRow()==row&&pgLineHole.getSecColumn()==column)
+                return true;
+        }
+        return false;
+    }
+
+    public List<PgLineHole> getCurrentHoleByAcu(Long pileAcuId){
+        Criteria criteria=createCriteria(PgLineHole.class);
+
+        criteria.add(Restrictions.eq("pileAcuId",pileAcuId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgLineHole> pgLineHoleList=criteria.list();
+
+        if(pgLineHoleList==null||pgLineHoleList.size()==0)
+            return null;
+        else
+            return pgLineHoleList;
+    }
+
+    public void addPgLIneHole(List<PgPileAcu> pgPileAcuList,String lineName,String secRow,String secColumn){
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            PgLineHole pgLineHole=new PgLineHole();
+            pgLineHole.setLineName(lineName);
+            pgLineHole.setPileAcuId(pgPileAcu.getId());
+            pgLineHole.setSecColumn(Long.valueOf(secColumn));
+            pgLineHole.setSecRow(Long.valueOf(secRow));
+            pgLineHole.setActive(true);
+
+            this.save(pgLineHole);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
new file mode 100644
index 0000000..2947ec4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -0,0 +1,143 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgLineHole;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileAcuManager extends HibernateEntityDao<PgPileAcu> {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgLineHoleManager pgLineHoleManager;
+
+    public PgPileAcu getPgPileAcuByCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null) return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgPileAcu> getPileAcuListByPileAcuStr(List<String> pileAcuList){
+        List<PgPileAcu> pgPileAcuList=new ArrayList<>();
+
+        try{
+            for(String pileAcu:pileAcuList){
+                PgPileAcu pgPileAcu=getPgPileAcuByCode(pileAcu);
+                if(pgPileAcu==null){
+                    pgPileAcuList=null;
+                    break;
+                }
+                pgPileAcuList.add(pgPileAcu);
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPileAcuList=null;
+        }
+
+        return pgPileAcuList;
+    }
+
+    public List<PgPlanResultRe> getPgPlanResultList(List<PgPlanTask> pgPlanTaskList){
+
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        for(PgPlanTask pgPlanTask:pgPlanTaskList){
+            List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
+            PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+            pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
+
+            pgPlanResultReList.add(pgPlanResultRe);
+        }
+
+        return pgPlanResultReList;
+    }
+
+    /*
+    获取规划结果
+     */
+    private List<PgPlanResult> getPgPlanResultByPlantask(PgPlanTask pgPlanTask){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+
+        try{
+            String lineName=pgPlanTask.getLineName();
+            List<PgPileAcu> pgPileAcuList=getPileAcuListByPileAcuStr(pgPlanTask.getPileAcuList());
+            if(pgPileAcuList==null) return null;
+
+            Long raodId=pgPileAcuList.get(0).getRoadId();
+            //获取pgPlanResultList
+            PgSection pgSection=pgSectionManager.getPgSectionByRoadAndLine(lineName,raodId);
+            pgPlanResultList=getPlanResult(lineName,pgPileAcuList,pgSection);
+
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            pgPlanResultList=null;
+        }
+
+        return pgPlanResultList;
+    }
+
+    private List<PgPlanResult> getPlanResult(String lineName,List<PgPileAcu> pgPileAcuList,PgSection pgSection){
+
+        List<PgPlanResult> pgPlanResultList=new ArrayList<>();
+        int rowCount=pgSection.getSecRow().intValue();
+        int columnCount=pgSection.getSecColumn().intValue();
+
+        for(int row=0;row<rowCount;row++) {
+            for(int column=0;column<columnCount;column++){
+                if(canPlanLine(lineName,pgPileAcuList,row,column))
+                {
+                    PgPlanResult pgPlanResult=new PgPlanResult();
+                    pgPlanResult.setLineName(lineName);
+                    pgPlanResult.setSecColumn(column);
+                    pgPlanResult.setSecRow(row);
+                    pgPlanResult.setLength(getAcuListLength(pgPileAcuList));
+                    pgPlanResultList.add(pgPlanResult);
+                }
+            }
+        }
+
+        return pgPlanResultList;
+    }
+
+    private boolean canPlanLine(String lineName,List<PgPileAcu> pgPileAcuList,int row,int column){
+        try {
+            for (PgPileAcu pgPileAcu : pgPileAcuList) {
+                List<PgLineHole> pgLineHoleList = pgLineHoleManager.getPgLineHole(lineName, pgPileAcu.getId());
+                if (pgLineHoleManager.isExistLine(pgLineHoleList, row, column)) return false;
+            }
+            return true;
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public Long getAcuListLength(List<PgPileAcu> pgPileAcuList){
+
+        Long length=null;
+        for(PgPileAcu pgPileAcu:pgPileAcuList){
+            length+=pgPileAcu.getLength();
+        }
+
+        return length;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
new file mode 100644
index 0000000..31ce1a4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java
@@ -0,0 +1,29 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgPileManager extends HibernateEntityDao<PgPile>{
+
+    public List<PgPileDTO> getPgPileDTOList(){
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgPile> pgPileList=criteria.list();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        pgPileDTOList=PgPileDTO.ConvertToDTOList(pgPileList);
+        if(pgPileDTOList==null||pgPileDTOList.size()==0)
+            return null;
+        else
+            return pgPileDTOList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
new file mode 100644
index 0000000..2393258
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java
@@ -0,0 +1,30 @@
+package com.casic.PgInterface.intelPlan.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PgSectionManager extends HibernateEntityDao<PgSection>{
+
+    public PgSection getPgSectionByRoadAndLine(String lineName,Long roadId){
+
+        Criteria criteria=createCriteria(PgPile.class);
+        criteria.add(Restrictions.eq("lineName",lineName));
+        criteria.add(Restrictions.eq("roadId",roadId));
+        criteria.add(Restrictions.eq("active",true));
+
+        List<PgSection> pgSectionList=criteria.list();
+        if(pgSectionList==null||pgSectionList.size()==0)
+            return null;
+        else
+            return pgSectionList.get(0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
index dd5dc67..9f7187d 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java
@@ -24,7 +24,6 @@
     @Resource
     private PgUserManager pgUserManager;
 
-
     //获取当前设备列表
     public List<PgLogDto> getAllLogs(String userName,String startTime,String endTime) {
         try {
@@ -59,5 +58,4 @@
         }
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index 3d8cd2c..934a087 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -76,4 +76,4 @@
             return null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
new file mode 100644
index 0000000..277cf3f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -0,0 +1,61 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.dto.PgPlanParams;
+import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
+import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import javax.annotation.Resource;
+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("pgInNewPlan")
+public class PgInNewPlanRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @POST
+    @Path("getPlanResult")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPlanResult(@ModelAttribute PgPlanParams pgPlanParams){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgPlanTask> pgPlanTaskList=new ArrayList<>();
+        List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
+
+        try{
+            if(pgPlanParams==null){
+                msg="请输入规划任务";
+            }
+            else {
+                pgPlanTaskList = pgPlanParams.getPgPlanTaskList();
+                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+                if(pgPlanResultReList==null)
+                    msg="管线智能规划出错";
+                else
+                    msg="管线智能规划完成";
+            }
+        }
+        catch(Exception ex){
+            msg="智能规划出错";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPlanResultReList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index f3b8f72..9def330 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -36,7 +36,6 @@
         String result="";
 
         try {
-
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
             result="true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
new file mode 100644
index 0000000..883adf9
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -0,0 +1,102 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
+import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+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.Map;
+
+@Component
+@Path("pgPileAcu")
+public class PgPileAcuRs {
+
+    @Resource
+    private PgPileAcuManager pgPileAcuManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    /*
+    新增桩号
+    */
+    @POST
+    @Path("addPileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPileAcu(@FormParam("acuCode") String acuCode,
+                                          @FormParam("length") String length,
+                                          @FormParam("road") String road)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+        try {
+            PgPileAcu pgPileAcu=new PgPileAcu();
+            pgPileAcu.setAcuCode(acuCode);
+            pgPileAcu.setLength(Long.valueOf(length));
+            if(pgRoad==null)
+                pgPileAcu.setRoadId(null);
+            else
+                pgPileAcu.setRoadId(pgRoad.getId());
+            pgPileAcu.setActive(true);
+
+            pgPileAcuManager.save(pgPileAcu);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+    */
+    @POST
+    @Path("deletePileAcu")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePileAcu(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
+            if(pgPileAcu==null){
+                result="false";
+                msg="不存在桩号分区";
+            }
+            else
+            {
+                pgPileAcu.setActive(false);
+                pgPileAcuManager.save(pgPileAcu);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
new file mode 100644
index 0000000..a93ae7a
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -0,0 +1,121 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.intelPlan.domain.PgPile;
+import com.casic.PgInterface.intelPlan.dto.PgPileDTO;
+import com.casic.PgInterface.intelPlan.manager.PgPileManager;
+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("pgPile")
+public class PgPileRs {
+
+    @Resource
+    private PgPileManager pgPileManager;
+
+    /*
+    新增桩号
+     */
+    @POST
+    @Path("addPile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> addPile(@FormParam("pileCode") String pileCode)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgPile pgPile=new PgPile();
+            pgPile.setPileCode(pileCode);
+            pgPile.setActive(true);
+
+            pgPileManager.save(pgPile);
+            result="true";
+            msg="保存成功";
+        } catch (Exception e) {
+            result = "false";
+            msg = "保存失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result", result);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+
+    /*
+    获取桩号列表
+     */
+    @POST
+    @Path("getPileList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPileList()throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        List<PgPileDTO> pgPileDTOList=new ArrayList<>();
+        String msg="";
+        try{
+            pgPileDTOList=pgPileManager.getPgPileDTOList();
+
+            msg="桩号列表获取成功";
+        }
+        catch(Exception ex){
+            pgPileDTOList=null;
+            msg="桩号列表获取成失败";
+            ex.printStackTrace();
+        }
+        resultMap.put("result",pgPileDTOList);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+    /*
+    删除桩号
+     */
+    @POST
+    @Path("deletePile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public  Map<String,Object> deletePile(@FormParam("id") Long id)throws Exception{
+        Map<String, Object> resultMap=new HashMap<>();
+
+        String result="";
+        String msg="";
+        try{
+            PgPile pgPile=pgPileManager.get(id);
+            if(pgPile==null){
+                result="false";
+                msg="不存在桩号";
+            }
+            else
+            {
+                pgPile.setActive(false);
+                pgPileManager.save(pgPile);
+
+                result="true";
+                msg="桩号删除成功";
+            }
+        }
+        catch(Exception ex){
+            result="false";
+            msg="桩号删除失败";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 90dc7c1..8c3ac4b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -1,15 +1,11 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
-import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
-import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
-import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,174 +34,34 @@
     @Resource
     private PgPipeLineManager pgPipeLineManager;
 
-    @Resource
-    private PipeGalleryManager pipeGalleryManager;
-
-    @Resource
-    private PgPartitionManager pgPartitionManager;
-
     /**
      * 新增管线
      */
     @POST
     @Path("addPipeLine")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addLog(@FormParam("lineName") String lineName,
-                                      @FormParam("lineType") String lineType,
+    public Map<String, Object> addLog(@FormParam("lineCode") String lineCode,
+                                      @FormParam("lineName") String lineType,
                                       @FormParam("ownerUnit") String ownerUnit,
-                                      @FormParam("enterDate") String enterDate,
-                                      @FormParam("layerNum") String layerNum,
                                       @FormParam("diameter") String diameter,
-                                      @FormParam("pipeLength") String pipeLength,
-                                      @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName) throws Exception {
+                                      @FormParam("secRow") String secRow,
+                                      @FormParam("secColumn") String secColumn,
+                                      @FormParam("pileAcuList") String pileAcuList) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            if(pgPipeLineManager.getPipeLineBylineName(lineName)!=null)
-            {
-                result = "false";
-                msg = "已存在同名管线:"+lineName;
-            }
-            else {
-                PgPipeLine pgPipeLine=new PgPipeLine();
-
-                pgPipeLine.setLineName(lineName);
-                pgPipeLine.setLineType(lineType);
-                pgPipeLine.setOwnerUnit(ownerUnit);
-                pgPipeLine.setLayerNum(layerNum);
-                pgPipeLine.setEnterDate(sdf.parse(enterDate));
-                pgPipeLine.setDiameter(diameter);
-                pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-                if(pgPartition==null)
-                    pgPipeLine.setPartitionId(null);
-                else
-                    pgPipeLine.setPartitionId(pgPartition.getId());
-
-                if(pipeGallery==null)
-                    pgPipeLine.setPipeGalleryId(null);
-                else
-                    pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-                pgPipeLine.setActive(1);
-
-                pgPipeLineManager.save(pgPipeLine);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /**
-     * 编辑管线
-     */
-    @POST
-    @Path("editPipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editPipeLine(@FormParam("id") String id,
-                                            @FormParam("lineName") String lineName,
-                                            @FormParam("lineType") String lineType,
-                                            @FormParam("ownerUnit") String ownerUnit,
-                                            @FormParam("enterDate") String enterDate,
-                                            @FormParam("layerNum") String layerNum,
-                                            @FormParam("diameter") String diameter,
-                                            @FormParam("pipeLength") String pipeLength,
-                                            @FormParam("pgName") String pgName,
-                                            @FormParam("parName") String parName) throws Exception {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
-        PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName);
-
-        try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
-
-            pgPipeLine.setLineName(lineName);
-            pgPipeLine.setLineType(lineType);
-            pgPipeLine.setOwnerUnit(ownerUnit);
-            pgPipeLine.setEnterDate(sdf.parse(enterDate));
-            pgPipeLine.setLayerNum(layerNum);
-            pgPipeLine.setDiameter(diameter);
-            pgPipeLine.setPipeLength(Double.valueOf(pipeLength));
-            if(pgPartition==null)
-                pgPipeLine.setPartitionId(null);
-            else
-                pgPipeLine.setPartitionId(pgPartition.getId());
-
-            if(pipeGallery==null)
-                pgPipeLine.setPipeGalleryId(null);
-            else
-                pgPipeLine.setPipeGalleryId(pipeGallery.getId());
-
-            pgPipeLine.setActive(1);
-
-            pgPipeLineManager.save(pgPipeLine);
-            result = "true";
-            msg = "编辑成功";
-        } catch (Exception e) {
-            result = "false";
-            msg = "编辑失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result",result);
-        resultMap.put("msg",msg);
-        return resultMap;
-    }
-
-    /**
-     * 删除管线
-     */
-    @POST
-    @Path("deletePipeLine")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deletePipeLine(@FormParam("id") String id)throws Exception {
-
         Map<String, Object> resultMap = new HashMap<>();
-        String msg="";
-        String result="false";
 
         try {
-            PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
-            if(pgPipeLine==null) {
-                msg = "不存在该管线信息";
-                result="false";
-            }
-            else
-            {
-                pgPipeLine.setActive(0);
-                pgPipeLineManager.save(pgPipeLine);
-                msg="管线删除成功";
-                result="true";
-            }
-        }catch(Exception e){
+               resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,ownerUnit,diameter,secRow,secColumn,pileAcuList);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="管线删除失败";
-            result="false";
+            resultMap.put("result","false");
+            resultMap.put("msg","保存失败");
+            return  resultMap;
         }
-        resultMap.put("msg",msg);
-        resultMap.put("result",result);
+
         return resultMap;
     }
 
@@ -235,18 +91,18 @@
      * 根据管线名称获取管线信息
      */
     @POST
-    @Path("getPipeLineByName")
+    @Path("getPipeLineByCode")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
         try {
-            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineName);
+            PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
             if(pgPipeLine==null)
-                msg="不存在："+lineName;
+                msg="不存在："+lineCode;
             else {
-                pgPipeLineDto = new PgPipeLineDto(pgPipeLine,pgPartitionManager,pipeGalleryManager);
+                pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
                 msg = "获取成功";
             }
         } catch (Exception e) {
@@ -265,7 +121,7 @@
     @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPipeLengthStatic()throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
new file mode 100644
index 0000000..9cb65d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -0,0 +1,99 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import com.casic.PgInterface.intelPlan.domain.PgSection;
+import com.casic.PgInterface.intelPlan.manager.PgSectionManager;
+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.Map;
+
+@Component
+@Path("pgSection")
+public class PgSectionRs {
+
+    @Resource
+    private PgSectionManager pgSectionManager;
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @POST
+    @Path("addPgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addPgSection(@FormParam("road") String road,
+                                           @FormParam("lineName") String lineName,
+                                           @FormParam("secRow") String secRow,
+                                           @FormParam("secColumn") String secColumn){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+        PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
+
+        try{
+            PgSection pgSection=new PgSection();
+
+            if(pgRoad==null)
+                pgSection.setRoadId(null);
+            else
+                pgSection.setRoadId(pgRoad.getId());
+            pgSection.setLineName(lineName);
+            pgSection.setSecRow(Long.valueOf(secRow));
+            pgSection.setSecColumn(Long.valueOf(secColumn));
+            pgSection.setActive(true);
+
+            pgSectionManager.save(pgSection);
+            msg="截面信息保存成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="界面信息保存失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    @POST
+    @Path("deletePgSection")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> deletePgSection(@FormParam("id") Long id){
+
+        Map<String,Object> resultMap=new HashMap<>();
+
+        String msg="";
+        String result="";
+
+        try{
+            PgSection pgSection=pgSectionManager.get(id);
+
+            pgSection.setActive(false);
+            pgSectionManager.save(pgSection);
+
+            msg="截面删除成功";
+            result="true";
+        }
+        catch(Exception ex){
+            msg="截面删除失败";
+            result="false";
+            ex.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
deleted file mode 100644
index c9ecddb..0000000
--- "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
deleted file mode 100644
index a4ec716..0000000
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/~$\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 d0a7435..0000000
--- "a/~$\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/~$\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"
index 7920004..d97d127 100644
--- "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"
Binary files differ
diff --git "a/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..cdff59f
--- /dev/null
+++ "b/~$\346\231\272\350\203\275\350\247\204\345\210\222.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
deleted file mode 100644
index 44e5569..0000000
--- "a/~$\350\257\264\346\230\21620181227.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
deleted file mode 100644
index c68c40b..0000000
--- "a/~$\350\257\264\346\230\21620190527.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190612.docx" "b/~$\350\257\264\346\230\21620190612.docx"
deleted file mode 100644
index 5cfb046..0000000
--- "a/~$\350\257\264\346\230\21620190612.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190726.docx" "b/~$\350\257\264\346\230\21620190726.docx"
deleted file mode 100644
index 78a896a..0000000
--- "a/~$\350\257\264\346\230\21620190726.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
deleted file mode 100644
index 575ddd4..0000000
--- "a/~$\350\257\264\346\230\21620190828.docx"
+++ /dev/null
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190910.docx" "b/~$\350\257\264\346\230\21620190910.docx"
index 7ab3eeb..01e93f2 100644
--- "a/~$\350\257\264\346\230\21620190910.docx"
+++ "b/~$\350\257\264\346\230\21620190910.docx"
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"
index 4407b37..8eb33fb 100644
--- "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"
Binary files differ
diff --git "a/\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/\346\231\272\350\203\275\350\247\204\345\210\222.docx"
new file mode 100644
index 0000000..bd2407d
--- /dev/null
+++ "b/\346\231\272\350\203\275\350\247\204\345\210\222.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\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"
index 1049d7f..f1de42a 100644
--- "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"
Binary files differ